From 0f8d5c6087c1da11519103fe21d405f22f3adc63 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 28 Jun 2012 18:43:19 +0100 Subject: [PATCH] libxc: xc_domain_restore, make toolstack_restore const-correct Update the one provider of this callback, in libxl. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xenguest.h | 2 +- tools/libxl/libxl_dom.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xenguest.h b/tools/libxc/xenguest.h index 91d53f7426..707e31cc5f 100644 --- a/tools/libxc/xenguest.h +++ b/tools/libxc/xenguest.h @@ -92,7 +92,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter /* callbacks provided by xc_domain_restore */ struct restore_callbacks { /* callback to restore toolstack specific data */ - int (*toolstack_restore)(uint32_t domid, uint8_t *buf, + int (*toolstack_restore)(uint32_t domid, const uint8_t *buf, uint32_t size, void* data); /* to be provided as the last argument to each callback function */ diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index d88629fc18..ce7a4441ed 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -469,13 +469,13 @@ static inline char *restore_helper(libxl__gc *gc, uint32_t domid, domid, phys_offset, node); } -static int libxl__toolstack_restore(uint32_t domid, uint8_t *buf, +static int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data) { libxl__gc *gc = (libxl__gc *) data; libxl_ctx *ctx = gc->owner; int i, ret; - uint8_t *ptr = buf; + const uint8_t *ptr = buf; uint32_t count = 0, version = 0; struct libxl__physmap_info* pi; char *xs_path; -- 2.30.2